Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 6 Aug 2010 00:26:44 +0000 (00:26 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 6 Aug 2010 00:26:44 +0000 (00:26 +0000)

Trivial merge